<!DOCTYPE html>
<html lang="en">
<<<<<<< .merge_file_cl6KGL
<head>
    <meta charset="UTF-8"/>
    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
    <!-- 上述3个meta标签*必须*放在最前面，任何其他内容都*必须*跟随其后！ -->
    <meta name="description" content=""/>
    <meta name="author" content=""/>
    <meta http-equiv="Access-Control-Allow-Origin" content="*">
    ';
    <link rel="icon" href="img/asset-favicon.ico"/>
    <title>社交-登录注册</title>
    <!-- 页面 css js -->
    <!-- <script type="text/javascript" src="../../plugins/sui/sui.min.js" charset="UTF-8"></script> -->
    <link rel="stylesheet" type="text/css" href="plugins/normalize-css/normalize.css"/>
    <link rel="stylesheet" type="text/css" href="plugins/yui/cssgrids-min.css"/>
    <link rel="stylesheet" type="text/css" href="plugins/sui/sui.min.css"/>
    <link rel="stylesheet" type="text/css" href="plugins/sui/sui-append.min.css"/>
    <link rel="stylesheet" type="text/css" href="plugins/font-awesome/css/font-awesome.min.css"/>
    <link rel="stylesheet" type="text/css" href="css/widget-base.css"/>
    <link rel="stylesheet" type="text/css" href="css/widget-head-foot.css"/>
    <link rel="stylesheet" type="text/css" href="css/page-sj-person-loginsign.css"/>
</head>
<body>
<!--头部导航-->
<header class="head-login">
    <div class="wrapper">
        <div class="sui-navbar">
            <div class="navbar-inner">
                <a href="./index-login.html" class="sui-brand"> <img src="img/asset-logo-black.png" alt="社交"/> </a>
                <span class="login-text">| 登录注册</span>
            </div>
        </div>
    </div>
</header>
<div class="bg"></div>
<div class="snow-container"></canvas></div>
<div class="wrapper loginsign" id="app">
    <div class="item signup" v-show="judge?0:1">
        <div class="form">
            <h3 class="loginsign-title">注册新账号</h3>
            <form class="sui-form">
                <div class="control-group">
                    <label for="inputname" class="control-label">名字</label>
                    <div class="controls">
                        <input type="text" id="inputname" placeholder="真实姓名或常用昵称" class="input-xlarge"
                               v-model="username"/>
                        <p class="tt">{{error_name_message}}</p>
                    </div>
                </div>
                <div class="different">
                    <div class="radio-content">
                        <div id="a1" class="phone">
                            <div class="control-group number">
                                <input type="text" placeholder="仅支持大陆手机号" class="input-xlarge" v-model="mobile"/>
                                <p class="tt">{{error_phone_message}}</p>
                            </div>
                            <div class="control-group code">
                                <div class="input-append">
                                    <input id="appendedInputButton" type="text" placeholder="短信验证"
                                           class="span2 input-large msg-input" v-model="sms_code"/>
                                    <button type="button" class="sui-btn msg-btn" @click="send_sms_code">
                                        <p>{{sms_code_tip}}</p>
                                    </button>
                                    <p class="tt">{{error_sms_code_message}}</p>
                                </div>
                            </div>
                            <div class="control-group">
                                <label for="inputpassword" class="control-label">密码</label>
                                <div class="controls">
                                    <input type="password" id="inputpassword" placeholder="请输入6-16位密码"
                                           class="input-xlarge" v-model="password"/>
                                </div>
                            </div>
                        </div>
                    </div>
                </div>
                <div class="control-group btn-signup">
                    <label class="control-label"></label>
                    <div class="controls">
                        <div>
                            <label>
                                <input type="checkbox" v-model="allow" @change="check_allow"/>
                                <span class="type-text" style="font-size:12px;">同意协议并接受《服务条款》</span>
                            </label>
                        </div>
                        <div>
                            <button type="button" class="sui-btn btn-danger btn-yes" @click="on_submit">注 册</button>
                        </div>
                        <div style="text-align: right">
                            <a @click="loginPage">已有账号点我登陆>>></a>
                        </div>
                    </div>
                </div>
            </form>
        </div>
    </div>


    <!--登陆-->
    <div class="item" v-show="judge?1:0">
        <div class="form">
            <h3 class="loginsign-title">用户登录</h3>
            <form class="sui-form login-form">
                <div class="control-group">
                    <label for="inputname" class="control-label">手机号：</label>
                    <div class="controls">
                        <input type="text" id="inputname" v-model="username" @blur="check_username" placeholder="11位手机号"
                               class="input-xlarge"
                               data-rules="required"/>
                        <p class="tt">{{error_name_message}}</p>
                    </div>
                </div>
                <div class="control-group">
                    <label for="inputpassword" class="control-label">密码：</label>
                    <div class="controls">
                        <input type="text" id="inputpassword" v-model="password" @blur="check_pwd" placeholder="输入登录密码"
                               class="input-xlarge"/>
                    </div>
                    <p class="tt">{{error_pwd_message}}</p>
                </div>
                <div class="controls">
                    <div>
                        <label>
                            <input type="checkbox" name="remember-me" v-model="remember"/>
                            <span class="type-text" style="font-size:12px;">记住登录状态</span>
                        </label>
                    </div>
                    <div>
                        <button type="button" @click="on_submit_loging" class="sui-btn btn-danger btn-yes">登 录</button>
                    </div>
                    <a @click="register">没有账号点我注册>></a>
                </div>
                <div class="other-methods">
                </div>
            </form>
        </div>
    </div>
</div>
<!--<div class="footer">-->
    <!--<div class="wrapper">-->
        <!--<div class="footer-bottom">-->
            <!--<div class="link">-->
                <!--<dl>-->
                    <!--<dt>网站相关</dt>-->
                    <!--<dd>关于我们</dd>-->
                    <!--<dd>服务条款</dd>-->
                    <!--<dd>帮助中心</dd>-->
                    <!--<dd>编辑器语法</dd>-->
                <!--</dl>-->
                <!--<dl>-->
                    <!--<dt>常用链接</dt>-->
                    <!--<dd>传智播客</dd>-->
                    <!--<dd>传智论坛</dd>-->
                <!--</dl>-->
                <!--<dl>-->
                    <!--<dt>联系我们</dt>-->
                    <!--<dd>联系我们</dd>-->
                    <!--<dd>加入我们</dd>-->
                    <!--<dd>建议反馈</dd>-->
                <!--</dl>-->
                <!--<dl>-->
                    <!--<dt>关注我们</dt>-->
                    <!--<dd>微博</dd>-->
                    <!--<dd>twitter</dd>-->
                <!--</dl>-->
                <!--<div class="xuke">-->
                    <!--<h3>内容许可</h3>-->
                    <!--<p>除特别说明外，用户内容均采用知识共享署名-非商业性使用-禁止演绎4.0 国际许可协议 (CC BY-NC-ND 4.0) 进行许可</p>-->
                    <!--<p>本站由 传智研究院 提供更新服务</p>-->
                <!--</div>-->
            <!--</div>-->
            <!--<p class="Copyright">Copyright &copy; 2017 传智问答社区 当前版本 0.0.1</p>-->
        <!--</div>-->
    <!--</div>-->
<!--</div>-->
</body>
</html>
<script src="./js/babel.min.js"></script>
<script src="./js/vue-2.5.16.js"></script>
<script src="./js/axios-0.18.0.min.js"></script>
<script src="./js/jquery.min.js"></script>
<script src="./js/snow.js"></script>
<script src="./js/jquery.pure.tooltips.js"></script>
<script src="./js/spop.min.js"></script>
<script src="./js/base.js"></script>
<script  type="text/babel" src="./js/person-loginsign.js"></script>
=======
 <head> 
  <meta charset="UTF-8" /> 
  <meta http-equiv="X-UA-Compatible" content="IE=edge" /> 
  <!-- 上述3个meta标签*必须*放在最前面，任何其他内容都*必须*跟随其后！ --> 
  <meta name="description" content="" /> 
  <meta name="author" content="" /> 
  <link rel="icon" href="./img/asset-favicon.ico" /> 
  <title>社交-登录注册</title> 
  <!-- 页面 css js --> 
  <!-- <script type="text/javascript" src="../../plugins/sui/sui.min.js" charset="UTF-8"></script> --> 
  <link rel="stylesheet" type="text/css" href="./plugins/normalize-css/normalize.css" /> 
  <link rel="stylesheet" type="text/css" href="./plugins/yui/cssgrids-min.css" /> 
  <link rel="stylesheet" type="text/css" href="./plugins/sui/sui.min.css" /> 
  <link rel="stylesheet" type="text/css" href="./plugins/sui/sui-append.min.css" /> 
  <link rel="stylesheet" type="text/css" href="./plugins/font-awesome/css/font-awesome.min.css" /> 
  <link rel="stylesheet" type="text/css" href="./css/widget-base.css" /> 
  <link rel="stylesheet" type="text/css" href="./css/widget-head-foot.css" /> 
  <link rel="stylesheet" type="text/css" href="./css/page-sj-person-loginsign.css" /> 
 </head> 
 <body> 
  <!--头部导航--> 
  <header class="head-login"> 
   <div class="wrapper"> 
    <div class="sui-navbar"> 
     <div class="navbar-inner"> 
      <a href="./index-login.html" class="sui-brand"> <img src="./img/asset-logo-black.png" alt="社交" /> </a> 
      <span class="login-text">| 登录注册</span> 
     </div> 
    </div> 
   </div>
  </header> 
  <div class="wrapper loginsign"> 
   <div class="item signup"> 
    <div class="form"> 
     <h3 class="loginsign-title">注册新账号</h3> 
     <form class="sui-form"> 
      <div class="control-group"> 
       <label for="inputname" class="control-label">名字</label> 
       <div class="controls"> 
        <input type="text" id="inputname" placeholder="真实姓名或常用昵称" class="input-xlarge" /> 
       </div> 
      </div> 
      <div class="different"> 
       <div class="radio-content"> 
        <div id="a1" class="phone"> 
         <div class="control-group number"> 
          <input type="text" placeholder="仅支持大陆手机号" class="input-xlarge" /> 
         </div> 
         <div class="control-group code"> 
          <div class="input-append"> 
           <input id="appendedInputButton" type="text" placeholder="短信验证" class="span2 input-large msg-input" /> 
           <button type="button" class="sui-btn msg-btn">获取验证码</button> 
          </div> 
         </div> 
         <div class="control-group"> 
          <label for="inputpassword" class="control-label">密码</label> 
          <div class="controls"> 
           <input type="text" id="inputpassword" placeholder="请输入6-16位密码" class="input-xlarge" /> 
          </div> 
         </div> 
        </div> 
       </div> 
      </div> 
      <div class="control-group btn-signup"> 
       <label class="control-label"></label> 
       <div class="controls"> 
        <label> <input type="checkbox" /><span class="type-text" style="font-size:12px;">同意协议并接受《服务条款》</span> </label> 
        <button type="button" class="sui-btn btn-danger btn-yes">注 册</button> 
       </div> 
      </div> 
     </form> 
    </div> 
   </div> 
   <div class="item"> 
    <div class="form"> 
     <h3 class="loginsign-title">用户登录</h3> 
     <form class="sui-form login-form"> 
      <div class="control-group"> 
       <label for="inputname" class="control-label">手机号：</label> 
       <div class="controls"> 
        <input type="text" id="inputname" placeholder="11位手机号" class="input-xlarge" data-rules="required" /> 
       </div> 
      </div> 
      <div class="control-group"> 
       <label for="inputpassword" class="control-label">密码：</label> 
       <div class="controls"> 
        <input type="text" id="inputpassword" placeholder="输入登录密码" class="input-xlarge" /> 
       </div> 
      </div> 
      <div class="controls"> 
       <label> <input type="checkbox" name="remember-me" /><span class="type-text" style="font-size:12px;">记住登录状态</span> </label> 
       <button type="button" class="sui-btn btn-danger btn-yes">登 录</button> 
      </div> 
      <div class="other-methods"> 
      </div> 
     </form> 
    </div> 
   </div> 
  </div>   
  <div class="footer"> 
   <div class="wrapper"> 
    <div class="footer-bottom"> 
     <div class="link"> 
      <dl> 
       <dt>
        网站相关
       </dt> 
       <dd>
        关于我们
       </dd> 
       <dd>
        服务条款
       </dd> 
       <dd>
        帮助中心
       </dd> 
       <dd>
        编辑器语法
       </dd> 
      </dl> 
      <dl> 
       <dt>
        常用链接
       </dt> 
       <dd>
        传智播客
       </dd> 
       <dd>
        传智论坛
       </dd> 
      </dl> 
      <dl> 
       <dt>
        联系我们
       </dt> 
       <dd>
        联系我们
       </dd> 
       <dd>
        加入我们
       </dd> 
       <dd>
        建议反馈
       </dd> 
      </dl> 
      <dl> 
       <dt>
        关注我们
       </dt> 
       <dd>
        微博
       </dd> 
       <dd>
        twitter
       </dd> 
      </dl> 
      <div class="xuke"> 
       <h3>内容许可</h3> 
       <p>除特别说明外，用户内容均采用知识共享署名-非商业性使用-禁止演绎4.0 国际许可协议 (CC BY-NC-ND 4.0) 进行许可</p> 
       <p>本站由 传智研究院 提供更新服务</p> 
      </div> 
     </div> 
     <p class="Copyright">Copyright &copy; 2017 传智问答社区 当前版本 0.0.1</p> 
    </div> 
   </div> 
  </div> 
 </body>
</html>
>>>>>>> .merge_file_Eew0AL
